wayland: Get min/max keycode from xkb keymap
authorMatthias Clasen <mclasen@redhat.com>
Sat, 26 Mar 2016 22:48:27 +0000 (18:48 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 26 Mar 2016 22:48:27 +0000 (18:48 -0400)
Instead of hardcoding 8/255 here.

gdk/wayland/gdkkeys-wayland.c

index 4819ab69d5c8fc836d8f50e5fde17a6361ceb0e4..46d2631046086269efb765bc77143db4e1e171e9 100644 (file)
@@ -133,10 +133,13 @@ gdk_wayland_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
   struct xkb_keymap *xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
   GArray *retval;
   guint keycode;
+  xkb_keycode_t min_keycode, max_keycode;
 
   retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
 
-  for (keycode = 8; keycode < 255; keycode++) /* FIXME: min/max keycode */
+  min_keycode = xkb_keymap_min_keycode (xkb_keymap);
+  max_keycode = xkb_keymap_max_keycode (xkb_keymap);
+  for (keycode = min_keycode; keycode < max_keycode; keycode++)
     {
       gint num_layouts, layout;
       num_layouts = xkb_keymap_num_layouts_for_key (xkb_keymap, keycode);